Use getters for http fields where available. (#364866, Björn Lindqvist)

2006-12-27  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/cups/gtkprintbackendcups.c: Use
        getters for http fields where available.  (#364866,
        Björn Lindqvist)

diff --git a/ChangeLog b/ChangeLog
index 4518a7fdf56455590351db1d06ac0f42f801544d..c0fdf6972a913f65698d8bf8dce0746dbe69e025 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c: Use
+       getters for http fields where available.  (#364866, 
+       Björn Lindqvist)
+
 2006-12-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_show): Add a g_return_if_fail.

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 5aab327f47f02c4ce39b76e7e938d5db39c22d58..8351325fb47b41c182e32ceacccce67a34a2292b 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -270,7 +270,7 @@ _cairo_write_to_cups (void                *closure,
 
   while (length > 0) 
     {
-      g_io_channel_write_chars (io, data, length, &written, &error);
+      g_io_channel_write_chars (io, (gchar *)data, length, &written, &error);
 
       if (error != NULL)
        {
@@ -503,27 +503,24 @@ cups_dispatch_watch_check (GSource *source)
   dispatch = (GtkPrintCupsDispatchWatch *) source;
 
   poll_state = gtk_cups_request_get_poll_state (dispatch->request);
-  
-  if (dispatch->data_poll == NULL && 
-      dispatch->request->http != NULL)
-    {
-      dispatch->data_poll = g_new0 (GPollFD, 1);
-      dispatch->data_poll->fd = dispatch->request->http->fd;
 
-      g_source_add_poll (source, dispatch->data_poll);
-    }
-            
-  if (dispatch->data_poll != NULL && dispatch->request->http != NULL)
+  if (dispatch->request->http != NULL)
     {
-      if (dispatch->data_poll->fd != dispatch->request->http->fd)
-        dispatch->data_poll->fd = dispatch->request->http->fd;
-
-      if (poll_state == GTK_CUPS_HTTP_READ)
-        dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
-      else if (poll_state == GTK_CUPS_HTTP_WRITE)
-        dispatch->data_poll->events = G_IO_OUT | G_IO_ERR;
+      if (dispatch->data_poll == NULL)
+       {
+         dispatch->data_poll = g_new0 (GPollFD, 1);
+         g_source_add_poll (source, dispatch->data_poll);
+       }
       else
-        dispatch->data_poll->events = 0;
+       {
+         if (poll_state == GTK_CUPS_HTTP_READ)
+           dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
+         else if (poll_state == GTK_CUPS_HTTP_WRITE)
+           dispatch->data_poll->events = G_IO_OUT | G_IO_ERR;
+         else
+           dispatch->data_poll->events = 0;
+       }
+      dispatch->data_poll->fd = httpGetFd (dispatch->request->http);
     }
     
   if (poll_state != GTK_CUPS_HTTP_IDLE)